public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-15 13:02:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

v 2.3.0 GA

Browse Source
This commit is contained in:
Crystal.Sea
2020-11-12 07:24:22 +08:00
parent 2928bff260
commit a44022b625
23 changed files with 490 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java
View File

@@ -21,13 +21,17 @@ import java.util.HashMap;
import java.util.List;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.maxkey.constants.ConstantsOperateMessage;
import org.maxkey.domain.ExcelImport;
import org.maxkey.domain.Organizations;
import org.maxkey.persistence.service.OrganizationsService;
import org.maxkey.web.WebContext;
import org.maxkey.web.component.TreeNode;
import org.maxkey.web.component.TreeNodeList;
import org.maxkey.web.message.Message;
import org.maxkey.web.message.MessageScope;
import org.maxkey.web.message.MessageType;
import org.maxkey.web.message.OperateType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -195,7 +199,18 @@ public class OrganizationsController {
public ModelAndView orgUsersList() { return new ModelAndView("orgs/orgUsersList"); }
@RequestMapping(value = "/import")
public ModelAndView importing(@ModelAttribute("excelImportFile")ExcelImport excelImportFile) {
ModelAndView modelAndView=new ModelAndView("/orgs/orgsImport");
if (excelImportFile.getExcelFile() != null && !excelImportFile.getExcelFile().isEmpty() && organizationsService.importing(excelImportFile.getExcelFile())) {
new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS), null, MessageType.success, OperateType.add, MessageScope.DB);
}else {
new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_ERROR), MessageType.error);
}
return modelAndView;
}

12
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java
View File

@@ -272,18 +272,6 @@ public class UserInfoController {
}
}
@ResponseBody
@RequestMapping(value="/changeUserinfoStatus")
public Message changeUserinfoStatus( @ModelAttribute("userInfo")UserInfo userInfo) {
_logger.debug(userInfo.getId());
if(userInfoService.update(userInfo)) {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_SUCCESS),MessageType.success);
} else {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_ERROR),MessageType.error);
}
}
@RequestMapping(value = "/import")
public ModelAndView importing(@ModelAttribute("excelImportFile")ExcelImport excelImportFile) {
ModelAndView modelAndView=new ModelAndView("/userinfo/usersImport");