修改处置资产，和部门建议列表

pcbms/src/main/java/com/hssx/pcbms/service/impl/GoodsServiceImpl.java

@@ -225,14 +225,14 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         } else if (no.getState() == 1) {
             oldState = "在用";
             User usering = userMapper.selectById(no.getUserId());
-            oldState = oldState + ("(" + usering.getName() + "/" + usering.getPhone() + ")");
+            oldState =(usering==null)?oldState+"(其他)":oldState + ("(" + usering.getName() + "/" + usering.getPhone() + ")");
         }
         if (goodsNo.getState() == 0) {
             nowState = "未用";
         } else if (goodsNo.getState() == 1) {
             nowState = "在用";
             User usering = userMapper.selectById(goodsNo.getUserId());
-            nowState=(usering==null)?"其他":nowState + ("(" + usering.getName() + "/" + usering.getPhone() + ")");
+            nowState=(usering==null)?nowState+"(其他)":nowState + ("(" + usering.getName() + "/" + usering.getPhone() + ")");
         } else if (goodsNo.getState() == 3) {
             nowState = "报废";
         }

pcbms/src/main/java/com/hssx/pcbms/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("goods_no");
+        strategy.setInclude("person_score");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);