wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

修改导入,登录

master
fangjiakai 2024-01-10 11:18:33 +08:00
parent 98406f230b
commit 60bb52b485
3 changed files with 92 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zcloud/controller/system/DepartmentController.java
View File

@ -239,7 +239,11 @@ public class DepartmentController extends BaseController {
depar.setDEPARTMENT_ID(dept.getString("DEPARTMENT_ID")); depar.setDEPARTMENT_ID(dept.getString("DEPARTMENT_ID"));
depar.setPARENT_ID(dept.getString("PARENT_ID")); depar.setPARENT_ID(dept.getString("PARENT_ID"));
depar.setNAME(dept.getString("NAME")); depar.setNAME(dept.getString("NAME"));
if(pd.get("rootDisabled")!= null && pd.get("rootDisabled").toString().equals("Y")){
depar.setDISABLED(true); depar.setDISABLED(true);
}else {
depar.setDISABLED(false);
}
depar.setTreeurl(url+depar.getDEPARTMENT_ID()); depar.setTreeurl(url+depar.getDEPARTMENT_ID());
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2.put("parentId", depar.getDEPARTMENT_ID()); pd2.put("parentId", depar.getDEPARTMENT_ID());

25
src/main/java/com/zcloud/controller/system/LoginController.java
View File

@ -126,18 +126,8 @@ public class LoginController extends BaseController {
pd.put("USERNAME", USERNAME); pd.put("USERNAME", USERNAME);
pd = usersService.findByUsername(pd); pd = usersService.findByUsername(pd);
PageData cpd = corpinfoService.findById(pd); PageData cpd = corpinfoService.findById(pd);
// System.out.println(Integer.parseInt(cpd.get("TRIALDAY").toString()) );
System.out.println(cpd.get("TRIALDAY"));
if (Integer.parseInt(cpd.get("HAS_LIVE").toString()) >0 || cpd.getString("ISDELIVER").equals("0") ) {
if (cpd.get("TRIALDAY")== null || Integer.parseInt(cpd.get("TRIALDAY").toString()) >= 0 ) {
System.out.println(cpd.get("TRIALDAY"));
System.out.println(cpd.getString("ISSTOP") == null);
System.out.println("1".equals(cpd.getString("ISSTOP")));
System.out.println("0".equals(cpd.getString("ISSTOP")));
System.out.println(cpd.getString("ISSTOP"));
// if (pd != null && pd.get("RIGHTS") != null && Tools.notEmpty(pd.get("RIGHTS").toString()) // if (pd != null && pd.get("RIGHTS") != null && Tools.notEmpty(pd.get("RIGHTS").toString())
// && "788664966448".equals(pd.get("RIGHTS").toString())) { // && "788664966448".equals(pd.get("RIGHTS").toString())) {
if ("1".equals(cpd.getString("ISSTOP")) || cpd.getString("ISSTOP") == null) {
map.put("USERNAME", USERNAME); map.put("USERNAME", USERNAME);
map.put("USER_ID", pd.getString("USER_ID")); map.put("USER_ID", pd.getString("USER_ID"));
map.put("NAME", pd.getString("NAME")); map.put("NAME", pd.getString("NAME"));
@ -228,16 +218,6 @@ public class LoginController extends BaseController {
FHLOG.save(log); FHLOG.save(log);
} else {
errInfo = "usercorperror";
}
} else {
errInfo = "userUSEerror";
}
}else {
errInfo = "userUSEerror";
}
} else { } else {
token.clear(); token.clear();
errInfo = "usererror"; errInfo = "usererror";
@ -258,11 +238,6 @@ public class LoginController extends BaseController {
map.put("msg", "用户名或密码有误"); map.put("msg", "用户名或密码有误");
} else if ("error".equals(errInfo)) { } else if ("error".equals(errInfo)) {
map.put("msg", "缺少参数"); map.put("msg", "缺少参数");
} else if ("userUSEerror".equals(errInfo)) {
map.put("msg", "尊敬的一体化数字平台客户，您的平台服务已过期，如需恢复平台使用功能，请联系我们客户服务人员，客服热线：13303358557");
}
else if ("usercorperror".equals(errInfo)) {
map.put("msg", "尊敬的一体化数字平台客户，您好， 您的平台服务已暂停使用，如需恢复使用请联系我们客户服务人员，客服热线：13313350564");
} }
return map; return map;
} }

5
src/main/java/com/zcloud/util/ObjectExcelRead.java
View File

@ -82,7 +82,7 @@ public class ObjectExcelRead {
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println(e); e.printStackTrace();
} }
return varList; return varList;
@ -98,6 +98,9 @@ public class ObjectExcelRead {
int rowCount = 0; int rowCount = 0;
for (int i = 1; i <= sheet.getLastRowNum(); i++) { for (int i = 1; i <= sheet.getLastRowNum(); i++) {
HSSFRow row = sheet.getRow(i); //行 HSSFRow row = sheet.getRow(i); //行
if(row == null){
break;
}
HSSFCell cell = row.getCell(0); HSSFCell cell = row.getCell(0);
if(null != cell){ if(null != cell){
rowCount ++; rowCount ++;